win32: Avoid a screen argument
authorMatthias Clasen <mclasen@redhat.com>
Fri, 17 Nov 2017 18:21:24 +0000 (13:21 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 17 Nov 2017 18:21:24 +0000 (13:21 -0500)
The screen is never used in _gdk_win32_screen_get_setting,
so drop it.

gdk/win32/gdkdisplay-win32.c
gdk/win32/gdkprivate-win32.h
gdk/win32/gdkproperty-win32.c

index 8488b64b2f4fecd8245088974a630d3ea77a7fe7..b3b6013f339aa87b0152819cffa639a4d2134799 100644 (file)
@@ -1205,9 +1205,7 @@ gdk_win32_display_get_setting (GdkDisplay  *display,
                                const gchar *name,
                                GValue      *value)
 {
-  return _gdk_win32_screen_get_setting (GDK_WIN32_DISPLAY (display)->screen,
-                                        name,
-                                        value);
+  return _gdk_win32_get_setting (name, value);
 }
 
 static void
index e8af1ed5f151937d21ea17cd5dc2f1abca6a3710..b917d65274d7a3d06014a37cba6eee6bd6b5fd55 100644 (file)
@@ -497,7 +497,7 @@ void _gdk_win32_window_change_property (GdkWindow    *window,
 void _gdk_win32_window_delete_property (GdkWindow *window, GdkAtom    property);
 
 /* Stray GdkWin32Screen members */
-gboolean _gdk_win32_screen_get_setting (GdkScreen   *screen, const gchar *name, GValue *value);
+gboolean _gdk_win32_get_setting (const gchar *name, GValue *value);
 void _gdk_win32_screen_on_displaychange_event (GdkWin32Screen *screen);
 GdkWindow *gdk_win32_screen_get_root_window (GdkScreen *screen);
 GdkWindow *gdk_win32_display_get_root_window (GdkDisplay *display);
index ff902375e5479d15acd79d345d0684f558f3c79a..72059f5c3edc6362653a1b7150ff09a96e4ca189 100644 (file)
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <glib/gprintf.h>
 
-#include "gdkscreen.h"
 #include "gdkproperty.h"
 #include "gdkselection.h"
 #include "gdkdisplayprivate.h"
@@ -344,12 +343,9 @@ _gdk_win32_window_delete_property (GdkWindow *window,
 
 */
 gboolean
-_gdk_win32_screen_get_setting (GdkScreen   *screen,
-                        const gchar *name,
+_gdk_win32_get_setting (const gchar *name,
                         GValue      *value)
 {
-  g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
-
   /*
    * XXX : if these values get changed through the Windoze UI the
    *       respective gdk_events are not generated yet.